This avoids double semicolons after macro expansion.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 44adbebe17)
tags/n0.8
| @@ -1719,7 +1719,7 @@ AVCodec ff_ ## name ## _encoder = { \ | |||||
| NULL, \ | NULL, \ | ||||
| .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, \ | .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, \ | ||||
| .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ | .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ | ||||
| }; | |||||
| } | |||||
| #else | #else | ||||
| #define ADPCM_ENCODER(id,name,long_name_) | #define ADPCM_ENCODER(id,name,long_name_) | ||||
| #endif | #endif | ||||
| @@ -1736,13 +1736,13 @@ AVCodec ff_ ## name ## _decoder = { \ | |||||
| NULL, \ | NULL, \ | ||||
| adpcm_decode_frame, \ | adpcm_decode_frame, \ | ||||
| .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ | .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ | ||||
| }; | |||||
| } | |||||
| #else | #else | ||||
| #define ADPCM_DECODER(id,name,long_name_) | #define ADPCM_DECODER(id,name,long_name_) | ||||
| #endif | #endif | ||||
| #define ADPCM_CODEC(id,name,long_name_) \ | #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. */ | /* Note: Do not forget to add new entries to the Makefile as well. */ | ||||
| ADPCM_DECODER(CODEC_ID_ADPCM_4XM, adpcm_4xm, "ADPCM 4X Movie"); | ADPCM_DECODER(CODEC_ID_ADPCM_4XM, adpcm_4xm, "ADPCM 4X Movie"); | ||||
| @@ -309,7 +309,7 @@ AVCodec ff_ ## name ## _decoder = { \ | |||||
| NULL, \ | NULL, \ | ||||
| dpcm_decode_frame, \ | dpcm_decode_frame, \ | ||||
| .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ | .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ | ||||
| }; | |||||
| } | |||||
| DPCM_DECODER(CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "DPCM Interplay"); | DPCM_DECODER(CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "DPCM Interplay"); | ||||
| DPCM_DECODER(CODEC_ID_ROQ_DPCM, roq_dpcm, "DPCM id RoQ"); | DPCM_DECODER(CODEC_ID_ROQ_DPCM, roq_dpcm, "DPCM id RoQ"); | ||||
| @@ -482,7 +482,7 @@ AVCodec ff_ ## name_ ## _encoder = { \ | |||||
| .close = pcm_encode_close, \ | .close = pcm_encode_close, \ | ||||
| .sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \ | .sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \ | ||||
| .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ | .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ | ||||
| }; | |||||
| } | |||||
| #else | #else | ||||
| #define PCM_ENCODER(id,sample_fmt_,name,long_name_) | #define PCM_ENCODER(id,sample_fmt_,name,long_name_) | ||||
| #endif | #endif | ||||
| @@ -498,13 +498,13 @@ AVCodec ff_ ## name_ ## _decoder = { \ | |||||
| .decode = pcm_decode_frame, \ | .decode = pcm_decode_frame, \ | ||||
| .sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \ | .sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \ | ||||
| .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ | .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ | ||||
| }; | |||||
| } | |||||
| #else | #else | ||||
| #define PCM_DECODER(id,sample_fmt_,name,long_name_) | #define PCM_DECODER(id,sample_fmt_,name,long_name_) | ||||
| #endif | #endif | ||||
| #define PCM_CODEC(id, sample_fmt_, name, long_name_) \ | #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. */ | /* 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"); | PCM_CODEC (CODEC_ID_PCM_ALAW, AV_SAMPLE_FMT_S16, pcm_alaw, "PCM A-law"); | ||||
| @@ -559,7 +559,7 @@ static RTPDynamicProtocolHandler ff_rdt_ ## n ## _handler = { \ | |||||
| .open = rdt_new_context, \ | .open = rdt_new_context, \ | ||||
| .close = rdt_free_context, \ | .close = rdt_free_context, \ | ||||
| .parse_packet = rdt_parse_packet \ | .parse_packet = rdt_parse_packet \ | ||||
| }; | |||||
| } | |||||
| RDT_HANDLER(live_video, "x-pn-multirate-realvideo-live", AVMEDIA_TYPE_VIDEO); | RDT_HANDLER(live_video, "x-pn-multirate-realvideo-live", AVMEDIA_TYPE_VIDEO); | ||||
| RDT_HANDLER(live_audio, "x-pn-multirate-realaudio-live", AVMEDIA_TYPE_AUDIO); | RDT_HANDLER(live_audio, "x-pn-multirate-realaudio-live", AVMEDIA_TYPE_AUDIO); | ||||
| @@ -288,7 +288,7 @@ RTPDynamicProtocolHandler ff_ms_rtp_ ## n ## _handler = { \ | |||||
| .open = asfrtp_new_context, \ | .open = asfrtp_new_context, \ | ||||
| .close = asfrtp_free_context, \ | .close = asfrtp_free_context, \ | ||||
| .parse_packet = asfrtp_parse_packet, \ | .parse_packet = asfrtp_parse_packet, \ | ||||
| }; | |||||
| } | |||||
| RTP_ASF_HANDLER(asf_pfv, "x-asf-pf", AVMEDIA_TYPE_VIDEO); | RTP_ASF_HANDLER(asf_pfv, "x-asf-pf", AVMEDIA_TYPE_VIDEO); | ||||
| RTP_ASF_HANDLER(asf_pfa, "x-asf-pf", AVMEDIA_TYPE_AUDIO); | RTP_ASF_HANDLER(asf_pfa, "x-asf-pf", AVMEDIA_TYPE_AUDIO); | ||||
| @@ -246,7 +246,7 @@ RTPDynamicProtocolHandler ff_ ## m ## _rtp_ ## n ## _handler = { \ | |||||
| .open = qt_rtp_new, \ | .open = qt_rtp_new, \ | ||||
| .close = qt_rtp_free, \ | .close = qt_rtp_free, \ | ||||
| .parse_packet = qt_rtp_parse_packet, \ | .parse_packet = qt_rtp_parse_packet, \ | ||||
| }; | |||||
| } | |||||
| RTP_QT_HANDLER(qt, vid, "X-QT", AVMEDIA_TYPE_VIDEO); | RTP_QT_HANDLER(qt, vid, "X-QT", AVMEDIA_TYPE_VIDEO); | ||||
| RTP_QT_HANDLER(qt, aud, "X-QT", AVMEDIA_TYPE_AUDIO); | RTP_QT_HANDLER(qt, aud, "X-QT", AVMEDIA_TYPE_AUDIO); | ||||