History

lavfi/framesync: remove dead code.

Fix CID 1416960.

Nicolas George committed 9 years ago

Commit 549ef6e1 parent 9bad5e51 file · +1 −3Browse files

Unified · Split

libavfilter/framesync.c+1−3
@@ -380,15 +380,13 @@ int ff_framesync_dualinput_get(FFFrameSync *fs, AVFrame **f0, AVFrame **f1) · 379 unmodified lines
380{380{
381 AVFilterContext *ctx = fs->parent;381 AVFilterContext *ctx = fs->parent;
382 AVFrame *mainpic = NULL, *secondpic = NULL;382 AVFrame *mainpic = NULL, *secondpic = NULL;
383 int ret = 0;383 int ret;
384 384
385 if ((ret = ff_framesync_get_frame(fs, 0, &mainpic, 1)) < 0 ||385 if ((ret = ff_framesync_get_frame(fs, 0, &mainpic, 1)) < 0 ||
386 (ret = ff_framesync_get_frame(fs, 1, &secondpic, 0)) < 0) {386 (ret = ff_framesync_get_frame(fs, 1, &secondpic, 0)) < 0) {
387 av_frame_free(&mainpic);387 av_frame_free(&mainpic);
388 return ret;388 return ret;
389 }389 }
390 if (ret < 0)
391 return ret;
392 av_assert0(mainpic);390 av_assert0(mainpic);
393 mainpic->pts = av_rescale_q(fs->pts, fs->time_base, ctx->outputs[0]->time_base);391 mainpic->pts = av_rescale_q(fs->pts, fs->time_base, ctx->outputs[0]->time_base);
394 if (ctx->is_disabled)392 if (ctx->is_disabled)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t