diff mbox

[FFmpeg-devel] lavfi: remove stray semicolons.

Message ID 20170112135820.13697-1-george@nsup.org
State Accepted
Commit f7191ccad663530c3fedbbefb9194a5c40fe927f
Headers show

Commit Message

Nicolas George Jan. 12, 2017, 1:58 p.m. UTC
Hopefully fix compilation with suncc.

Signed-off-by: Nicolas George <george@nsup.org>
---
 libavfilter/asrc_anoisesrc.c |  2 +-
 libavfilter/buffersink.c     | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)


Well, I am responsible for some of them, but not all of them, and it has
been broken for quite some time.

Comments

Paul B Mahol Jan. 12, 2017, 2:06 p.m. UTC | #1
On 1/12/17, Nicolas George <george@nsup.org> wrote:
> Hopefully fix compilation with suncc.
>
> Signed-off-by: Nicolas George <george@nsup.org>
> ---
>  libavfilter/asrc_anoisesrc.c |  2 +-
>  libavfilter/buffersink.c     | 22 +++++++++++-----------
>  2 files changed, 12 insertions(+), 12 deletions(-)
>
>
> Well, I am responsible for some of them, but not all of them, and it has
> been broken for quite some time.
>
>
> diff --git a/libavfilter/asrc_anoisesrc.c b/libavfilter/asrc_anoisesrc.c
> index e4d4013749..709224c4cb 100644
> --- a/libavfilter/asrc_anoisesrc.c
> +++ b/libavfilter/asrc_anoisesrc.c
> @@ -103,7 +103,7 @@ static av_cold int query_formats(AVFilterContext *ctx)
>  static double white_filter(double white, double *buf)
>  {
>      return white;
> -};
> +}
>
>  static double pink_filter(double white, double *buf)
>  {
> diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
> index b301e9f5ee..0f87b5439a 100644
> --- a/libavfilter/buffersink.c
> +++ b/libavfilter/buffersink.c
> @@ -186,20 +186,20 @@ type av_buffersink_get_##field(const AVFilterContext
> *ctx) { \
>      return ctx->inputs[0]->field; \
>  }
>
> -MAKE_AVFILTERLINK_ACCESSOR(enum AVMediaType , type               );
> -MAKE_AVFILTERLINK_ACCESSOR(AVRational       , time_base          );
> -MAKE_AVFILTERLINK_ACCESSOR(int              , format             );
> +MAKE_AVFILTERLINK_ACCESSOR(enum AVMediaType , type               )
> +MAKE_AVFILTERLINK_ACCESSOR(AVRational       , time_base          )
> +MAKE_AVFILTERLINK_ACCESSOR(int              , format             )
>
> -MAKE_AVFILTERLINK_ACCESSOR(AVRational       , frame_rate         );
> -MAKE_AVFILTERLINK_ACCESSOR(int              , w                  );
> -MAKE_AVFILTERLINK_ACCESSOR(int              , h                  );
> -MAKE_AVFILTERLINK_ACCESSOR(AVRational       , sample_aspect_ratio);
> +MAKE_AVFILTERLINK_ACCESSOR(AVRational       , frame_rate         )
> +MAKE_AVFILTERLINK_ACCESSOR(int              , w                  )
> +MAKE_AVFILTERLINK_ACCESSOR(int              , h                  )
> +MAKE_AVFILTERLINK_ACCESSOR(AVRational       , sample_aspect_ratio)
>
> -MAKE_AVFILTERLINK_ACCESSOR(int              , channels           );
> -MAKE_AVFILTERLINK_ACCESSOR(uint64_t         , channel_layout     );
> -MAKE_AVFILTERLINK_ACCESSOR(int              , sample_rate        );
> +MAKE_AVFILTERLINK_ACCESSOR(int              , channels           )
> +MAKE_AVFILTERLINK_ACCESSOR(uint64_t         , channel_layout     )
> +MAKE_AVFILTERLINK_ACCESSOR(int              , sample_rate        )
>
> -MAKE_AVFILTERLINK_ACCESSOR(AVBufferRef *    , hw_frames_ctx      );
> +MAKE_AVFILTERLINK_ACCESSOR(AVBufferRef *    , hw_frames_ctx      )
>
>  static av_cold int vsink_init(AVFilterContext *ctx, void *opaque)
>  {
> --
> 2.11.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

ok, i guess
Nicolas George Jan. 12, 2017, 2:12 p.m. UTC | #2
Le tridi 23 nivôse, an CCXXV, Paul B Mahol a écrit :
> ok, i guess

Thanks, pushed.

Regards,
Nicolas George Jan. 12, 2017, 2:59 p.m. UTC | #3
Le tridi 23 nivôse, an CCXXV, Nicolas George a écrit :
> Thanks, pushed.

suncc still complains that:

"vf_noise.c", [line_noise_avg_mmx]:ube: error: Cannot allocate register for argument '%5' in GASM Inlining

But now that is the only error.

Regards,
diff mbox

Patch

diff --git a/libavfilter/asrc_anoisesrc.c b/libavfilter/asrc_anoisesrc.c
index e4d4013749..709224c4cb 100644
--- a/libavfilter/asrc_anoisesrc.c
+++ b/libavfilter/asrc_anoisesrc.c
@@ -103,7 +103,7 @@  static av_cold int query_formats(AVFilterContext *ctx)
 static double white_filter(double white, double *buf)
 {
     return white;
-};
+}
 
 static double pink_filter(double white, double *buf)
 {
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index b301e9f5ee..0f87b5439a 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -186,20 +186,20 @@  type av_buffersink_get_##field(const AVFilterContext *ctx) { \
     return ctx->inputs[0]->field; \
 }
 
-MAKE_AVFILTERLINK_ACCESSOR(enum AVMediaType , type               );
-MAKE_AVFILTERLINK_ACCESSOR(AVRational       , time_base          );
-MAKE_AVFILTERLINK_ACCESSOR(int              , format             );
+MAKE_AVFILTERLINK_ACCESSOR(enum AVMediaType , type               )
+MAKE_AVFILTERLINK_ACCESSOR(AVRational       , time_base          )
+MAKE_AVFILTERLINK_ACCESSOR(int              , format             )
 
-MAKE_AVFILTERLINK_ACCESSOR(AVRational       , frame_rate         );
-MAKE_AVFILTERLINK_ACCESSOR(int              , w                  );
-MAKE_AVFILTERLINK_ACCESSOR(int              , h                  );
-MAKE_AVFILTERLINK_ACCESSOR(AVRational       , sample_aspect_ratio);
+MAKE_AVFILTERLINK_ACCESSOR(AVRational       , frame_rate         )
+MAKE_AVFILTERLINK_ACCESSOR(int              , w                  )
+MAKE_AVFILTERLINK_ACCESSOR(int              , h                  )
+MAKE_AVFILTERLINK_ACCESSOR(AVRational       , sample_aspect_ratio)
 
-MAKE_AVFILTERLINK_ACCESSOR(int              , channels           );
-MAKE_AVFILTERLINK_ACCESSOR(uint64_t         , channel_layout     );
-MAKE_AVFILTERLINK_ACCESSOR(int              , sample_rate        );
+MAKE_AVFILTERLINK_ACCESSOR(int              , channels           )
+MAKE_AVFILTERLINK_ACCESSOR(uint64_t         , channel_layout     )
+MAKE_AVFILTERLINK_ACCESSOR(int              , sample_rate        )
 
-MAKE_AVFILTERLINK_ACCESSOR(AVBufferRef *    , hw_frames_ctx      );
+MAKE_AVFILTERLINK_ACCESSOR(AVBufferRef *    , hw_frames_ctx      )
 
 static av_cold int vsink_init(AVFilterContext *ctx, void *opaque)
 {