shithub: libvpx

Info  •  Files  •  Log  •  Branches

tools_common.h: fix usage_exit() prototype

+ the definitions in the examples

silences a missing-prototype warning

Change-Id: I7c064cacd6d2073a6107de6c3e2cc46ef8a68411

--- a/examples/decode_to_md5.c

+++ b/examples/decode_to_md5.c

@@ -71,7 +71,7 @@

 static const char *exec_name;

-void usage_exit() {

+void usage_exit(void) {

   fprintf(stderr, "Usage: %s <infile> <outfile>\n", exec_name);

   exit(EXIT_FAILURE);

 }

--- a/examples/decode_with_drops.c

+++ b/examples/decode_with_drops.c

@@ -65,7 +65,7 @@

 static const char *exec_name;

-void usage_exit() {

+void usage_exit(void) {

   fprintf(stderr, "Usage: %s <infile> <outfile> <N-M|N/M>\n", exec_name);

   exit(EXIT_FAILURE);

 }

--- a/examples/postproc.c

+++ b/examples/postproc.c

@@ -52,7 +52,7 @@

 static const char *exec_name;

-void usage_exit() {

+void usage_exit(void) {

   fprintf(stderr, "Usage: %s <infile> <outfile>\n", exec_name);

   exit(EXIT_FAILURE);

 }

--- a/examples/resize_util.c

+++ b/examples/resize_util.c

@@ -15,6 +15,7 @@

 #include <stdlib.h>

 #include <string.h>

+#include "../tools_common.h"

 #include "../vp9/encoder/vp9_resize.h"

 static const char *exec_name = NULL;

@@ -26,7 +27,7 @@

   printf("<output_yuv> [<frames>]\n");

 }

-void usage_exit() {

+void usage_exit(void) {

   usage();

   exit(EXIT_FAILURE);

 }

--- a/examples/set_maps.c

+++ b/examples/set_maps.c

@@ -55,7 +55,7 @@

 static const char *exec_name;

-void usage_exit() {

+void usage_exit(void) {

   fprintf(stderr, "Usage: %s <codec> <width> <height> <infile> <outfile>\n",

           exec_name);

   exit(EXIT_FAILURE);

--- a/examples/simple_decoder.c

+++ b/examples/simple_decoder.c

@@ -88,7 +88,7 @@

 static const char *exec_name;

-void usage_exit() {

+void usage_exit(void) {

   fprintf(stderr, "Usage: %s <infile> <outfile>\n", exec_name);

   exit(EXIT_FAILURE);

 }

--- a/examples/simple_encoder.c

+++ b/examples/simple_encoder.c

@@ -106,7 +106,7 @@

 static const char *exec_name;

-void usage_exit() {

+void usage_exit(void) {

   fprintf(stderr,

           "Usage: %s <codec> <width> <height> <infile> <outfile> "

               "<keyframe-interval> [<error-resilient>]\nSee comments in "

--- a/examples/twopass_encoder.c

+++ b/examples/twopass_encoder.c

@@ -58,7 +58,7 @@

 static const char *exec_name;

-void usage_exit() {

+void usage_exit(void) {

   fprintf(stderr, "Usage: %s <codec> <width> <height> <infile> <outfile>\n",

           exec_name);

   exit(EXIT_FAILURE);

--- a/examples/vp8_multi_resolution_encoder.c

+++ b/examples/vp8_multi_resolution_encoder.c

@@ -41,11 +41,11 @@

 #include "vpx/vpx_encoder.h"

 #include "vpx/vp8cx.h"

 #include "vpx_ports/mem_ops.h"

-#include "./tools_common.h"

+#include "../tools_common.h"

 #define interface (vpx_codec_vp8_cx())

 #define fourcc    0x30385056

-void usage_exit() {

+void usage_exit(void) {

   exit(EXIT_FAILURE);

 }

--- a/examples/vp8cx_set_ref.c

+++ b/examples/vp8cx_set_ref.c

@@ -58,7 +58,7 @@

 static const char *exec_name;

-void usage_exit() {

+void usage_exit(void) {

   fprintf(stderr, "Usage: %s <width> <height> <infile> <outfile> <frame>\n",

           exec_name);

   exit(EXIT_FAILURE);

--- a/examples/vp9_lossless_encoder.c

+++ b/examples/vp9_lossless_encoder.c

@@ -20,7 +20,7 @@

 static const char *exec_name;

-void usage_exit() {

+void usage_exit(void) {

   fprintf(stderr, "vp9_lossless_encoder: Example demonstrating VP9 lossless "

                   "encoding feature. Supports raw input only.\n");

   fprintf(stderr, "Usage: %s <width> <height> <infile> <outfile>\n", exec_name);

--- a/examples/vp9_spatial_svc_encoder.c

+++ b/examples/vp9_spatial_svc_encoder.c

@@ -116,7 +116,7 @@

 static const char *exec_name;

-void usage_exit() {

+void usage_exit(void) {

   fprintf(stderr, "Usage: %s <options> input_filename output_filename\n",

           exec_name);

   fprintf(stderr, "Options:\n");

--- a/examples/vpx_temporal_svc_encoder.c

+++ b/examples/vpx_temporal_svc_encoder.c

@@ -28,7 +28,7 @@

 static const char *exec_name;

-void usage_exit() {

+void usage_exit(void) {

   exit(EXIT_FAILURE);

 }

--- a/tools_common.h

+++ b/tools_common.h

@@ -119,7 +119,7 @@

 void die_codec(vpx_codec_ctx_t *ctx, const char *s) VPX_NO_RETURN;

 /* The tool including this file must define usage_exit() */

-void usage_exit() VPX_NO_RETURN;

+void usage_exit(void) VPX_NO_RETURN;

 #undef VPX_NO_RETURN

--- a/vpxdec.c

+++ b/vpxdec.c

@@ -169,7 +169,7 @@

 }

 #endif

-void usage_exit() {

+void usage_exit(void) {

   int i;

   fprintf(stderr, "Usage: %s <options> filename\n\n"

--- a/vpxenc.c

+++ b/vpxenc.c

@@ -467,7 +467,7 @@

 static const arg_def_t *no_args[] = { NULL };

-void usage_exit() {

+void usage_exit(void) {

   int i;

   fprintf(stderr, "Usage: %s <options> -o dst_filename src_filename \n",