RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-30 11:22:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '3a16ec19d2426457419cb8a7304f97982699efda'

Browse Source 
* commit '3a16ec19d2426457419cb8a7304f97982699efda':
  vf_interlace: check one av_frame_clone allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-19 18:06:22 +01:00
commit 0a382aa99b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/vf_interlace.c
View File

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