diff mbox

[FFmpeg-devel] lavfi/framesync: remove dead code.

Message ID 20170912092401.22222-1-george@nsup.org
State Accepted
Commit 549ef6ef9a8168281640b9cd0240abe071cbbda3
Headers show

Commit Message

Nicolas George Sept. 12, 2017, 9:24 a.m. UTC 
Fix CID 1416960.

Signed-off-by: Nicolas George <george@nsup.org>
---
 libavfilter/framesync.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Paul B Mahol Sept. 12, 2017, 10:14 a.m. UTC | #1 
On 9/12/17, Nicolas George <george@nsup.org> wrote:
> Fix CID 1416960.
>
> Signed-off-by: Nicolas George <george@nsup.org>
> ---
>  libavfilter/framesync.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>

lgtm
Nicolas George Sept. 12, 2017, 10:37 a.m. UTC | #2 
Le sextidi 26 fructidor, an CCXXV, Paul B Mahol a écrit :
> lgtm

Thanks, pushed.

Regards,
diff mbox

Patch

diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c
index ebfbcaf090..be9f99c451 100644
--- a/libavfilter/framesync.c
+++ b/libavfilter/framesync.c
@@ -380,15 +380,13 @@  int ff_framesync_dualinput_get(FFFrameSync *fs, AVFrame **f0, AVFrame **f1)
 {
     AVFilterContext *ctx = fs->parent;
     AVFrame *mainpic = NULL, *secondpic = NULL;
-    int ret = 0;
+    int ret;
 
     if ((ret = ff_framesync_get_frame(fs, 0, &mainpic,   1)) < 0 ||
         (ret = ff_framesync_get_frame(fs, 1, &secondpic, 0)) < 0) {
         av_frame_free(&mainpic);
         return ret;
     }
-    if (ret < 0)
-        return ret;
     av_assert0(mainpic);
     mainpic->pts = av_rescale_q(fs->pts, fs->time_base, ctx->outputs[0]->time_base);
     if (ctx->is_disabled)