1 files changed, 8 insertions, 13 deletions
diff --git a/libavfilter/vf_deinterlace_qsv.c b/libavfilter/vf_deinterlace_qsv.c
index 5cda286839..bd43ef7bba 100644
--- a/libavfilter/vf_deinterlace_qsv.c
+++ b/libavfilter/vf_deinterlace_qsv.c
@@ -1,18 +1,18 @@
 /*
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -74,7 +74,6 @@ typedef struct QSVDeintContext {
 
     int64_t last_pts;
 
-    int got_output_frame;
     int eof;
 } QSVDeintContext;
 
@@ -110,8 +109,10 @@ static int qsvdeint_query_formats(AVFilterContext *ctx)
         AV_PIX_FMT_QSV, AV_PIX_FMT_NONE,
     };
     AVFilterFormats *pix_fmts  = ff_make_format_list(pixel_formats);
+    int ret;
 
-    ff_set_common_formats(ctx, pix_fmts);
+    if ((ret = ff_set_common_formats(ctx, pix_fmts)) < 0)
+        return ret;
 
     return 0;
 }
@@ -521,14 +522,8 @@ static int qsvdeint_filter_frame(AVFilterLink *link, AVFrame *in)
 static int qsvdeint_request_frame(AVFilterLink *outlink)
 {
     AVFilterContext *ctx = outlink->src;
-    QSVDeintContext   *s = ctx->priv;
-    int ret = 0;
 
-    s->got_output_frame = 0;
-    while (ret >= 0 && !s->got_output_frame)
-        ret = ff_request_frame(ctx->inputs[0]);
-
-    return ret;
+    return ff_request_frame(ctx->inputs[0]);
 }
 
 #define OFFSET(x) offsetof(QSVDeintContext, x)