highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/framesync: remove dead code.

Browse Source 
Fix CID 1416960.
This commit is contained in:
Nicolas George 2017-09-12 11:23:39 +02:00
parent 9bad5e5319
commit 549ef6ef9a
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/framesync.c
View File

@ -380,15 +380,13 @@ int ff_framesync_dualinput_get(FFFrameSync *fs, AVFrame **f0, AVFrame **f1)
{ {
AVFilterContext *ctx = fs->parent; AVFilterContext *ctx = fs->parent;
AVFrame *mainpic = NULL, *secondpic = NULL; AVFrame *mainpic = NULL, *secondpic = NULL;
int ret = 0; int ret;
if ((ret = ff_framesync_get_frame(fs, 0, &mainpic, 1)) < 0 || if ((ret = ff_framesync_get_frame(fs, 0, &mainpic, 1)) < 0 ||
(ret = ff_framesync_get_frame(fs, 1, &secondpic, 0)) < 0) { (ret = ff_framesync_get_frame(fs, 1, &secondpic, 0)) < 0) {
av_frame_free(&mainpic); av_frame_free(&mainpic);
return ret; return ret;
} }
if (ret < 0)
return ret;
av_assert0(mainpic); av_assert0(mainpic);
mainpic->pts = av_rescale_q(fs->pts, fs->time_base, ctx->outputs[0]->time_base); mainpic->pts = av_rescale_q(fs->pts, fs->time_base, ctx->outputs[0]->time_base);
if (ctx->is_disabled) if (ctx->is_disabled)