aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-02-10 12:04:25 +0000
committerMans Rullgard <mans@mansr.com>2011-02-10 21:45:17 +0000
commit44adbebe1744c68d66d7f811c38270fdcc89665a (patch)
treef54d8c51945df57d392f1cd6a6b577103d440b46 /libavcodec
parentdf211c3ab73b36208ac4511a9cd7feb817f551fa (diff)
downloadffmpeg-44adbebe1744c68d66d7f811c38270fdcc89665a.tar.gz
Remove final semicolon from some macros
This avoids double semicolons after macro expansion. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/adpcm.c6
-rw-r--r--libavcodec/dpcm.c2
-rw-r--r--libavcodec/pcm.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index fb5bdc7faa..826c588676 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1719,7 +1719,7 @@ AVCodec ff_ ## name ## _encoder = { \
NULL, \
.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, \
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
-};
+}
#else
#define ADPCM_ENCODER(id,name,long_name_)
#endif
@@ -1736,13 +1736,13 @@ AVCodec ff_ ## name ## _decoder = { \
NULL, \
adpcm_decode_frame, \
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
-};
+}
#else
#define ADPCM_DECODER(id,name,long_name_)
#endif
#define ADPCM_CODEC(id,name,long_name_) \
- ADPCM_ENCODER(id,name,long_name_) ADPCM_DECODER(id,name,long_name_)
+ ADPCM_ENCODER(id,name,long_name_); ADPCM_DECODER(id,name,long_name_)
/* Note: Do not forget to add new entries to the Makefile as well. */
ADPCM_DECODER(CODEC_ID_ADPCM_4XM, adpcm_4xm, "ADPCM 4X Movie");
diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c
index 6053a14550..ee8eb6a722 100644
--- a/libavcodec/dpcm.c
+++ b/libavcodec/dpcm.c
@@ -309,7 +309,7 @@ AVCodec ff_ ## name ## _decoder = { \
NULL, \
dpcm_decode_frame, \
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
-};
+}
DPCM_DECODER(CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "DPCM Interplay");
DPCM_DECODER(CODEC_ID_ROQ_DPCM, roq_dpcm, "DPCM id RoQ");
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index 0785a9d2ab..cdc11f80d0 100644
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -482,7 +482,7 @@ AVCodec ff_ ## name_ ## _encoder = { \
.close = pcm_encode_close, \
.sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
-};
+}
#else
#define PCM_ENCODER(id,sample_fmt_,name,long_name_)
#endif
@@ -498,13 +498,13 @@ AVCodec ff_ ## name_ ## _decoder = { \
.decode = pcm_decode_frame, \
.sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
-};
+}
#else
#define PCM_DECODER(id,sample_fmt_,name,long_name_)
#endif
#define PCM_CODEC(id, sample_fmt_, name, long_name_) \
- PCM_ENCODER(id,sample_fmt_,name,long_name_) PCM_DECODER(id,sample_fmt_,name,long_name_)
+ PCM_ENCODER(id,sample_fmt_,name,long_name_); PCM_DECODER(id,sample_fmt_,name,long_name_)
/* Note: Do not forget to add new entries to the Makefile as well. */
PCM_CODEC (CODEC_ID_PCM_ALAW, AV_SAMPLE_FMT_S16, pcm_alaw, "PCM A-law");