Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavfilter / vf_fieldorder.c

diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c
index a9347fd632071dfa0127c5a8ba6eb76f9157e1e5..4f657358d4e002fe7d1fadd40820d169c998a5ff 100644 (file)
--- a/libavfilter/vf_fieldorder.c
+++ b/libavfilter/vf_fieldorder.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2011 Mark Himsley
  *
- * 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
  */
 
@@ -58,7 +58,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
         return AVERROR(EINVAL);
     }
 
-    av_log(ctx, AV_LOG_INFO, "output field order: %s\n",
+    av_log(ctx, AV_LOG_VERBOSE, "output field order: %s\n",
             fieldorder->dst_tff ? tff : bff);
 
     return 0;
@@ -221,7 +221,7 @@ AVFilter avfilter_vf_fieldorder = {
     .init          = init,
     .priv_size     = sizeof(FieldOrderContext),
     .query_formats = query_formats,
-    .inputs        = (AVFilterPad[]) {{ .name             = "default",
+    .inputs        = (const AVFilterPad[]) {{ .name       = "default",
                                         .type             = AVMEDIA_TYPE_VIDEO,
                                         .config_props     = config_input,
                                         .start_frame      = start_frame,
@@ -231,7 +231,7 @@ AVFilter avfilter_vf_fieldorder = {
                                         .min_perms        = AV_PERM_READ,
                                         .rej_perms        = AV_PERM_REUSE2|AV_PERM_PRESERVE,},
                                       { .name = NULL}},
-    .outputs       = (AVFilterPad[]) {{ .name             = "default",
+    .outputs       = (const AVFilterPad[]) {{ .name       = "default",
                                         .type             = AVMEDIA_TYPE_VIDEO, },
                                       { .name = NULL}},
 };