Mercurial > libavformat.hg
changeset 3871:e6aeb2733e34 libavformat
Replace generic CONFIG_MUXERS preprocessor conditionals by more specific
CONFIG_FOO_MUXER conditionals where appropriate.
| author | diego |
|---|---|
| date | Tue, 02 Sep 2008 22:45:13 +0000 |
| parents | 97a01cb166f5 |
| children | b2977baec240 |
| files | aiff.c amr.c au.c dvenc.c img2.c libnut.c mmf.c mp3.c wav.c |
| diffstat | 9 files changed, 18 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/aiff.c Tue Sep 02 22:31:41 2008 +0000 +++ b/aiff.c Tue Sep 02 22:45:13 2008 +0000 @@ -166,7 +166,7 @@ return num_frames; } -#ifdef CONFIG_MUXERS +#ifdef CONFIG_AIFF_MUXER typedef struct { offset_t form; offset_t frames; @@ -289,7 +289,7 @@ return 0; } -#endif //CONFIG_MUXERS +#endif /* CONFIG_AIFF_MUXER */ static int aiff_probe(AVProbeData *p) {
--- a/amr.c Tue Sep 02 22:31:41 2008 +0000 +++ b/amr.c Tue Sep 02 22:45:13 2008 +0000 @@ -30,7 +30,7 @@ static const char AMR_header [] = "#!AMR\n"; static const char AMRWB_header [] = "#!AMR-WB\n"; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_AMR_MUXER static int amr_write_header(AVFormatContext *s) { ByteIOContext *pb = s->pb; @@ -60,7 +60,7 @@ put_flush_packet(s->pb); return 0; } -#endif /* CONFIG_MUXERS */ +#endif /* CONFIG_AMR_MUXER */ static int amr_probe(AVProbeData *p) {
--- a/au.c Tue Sep 02 22:31:41 2008 +0000 +++ b/au.c Tue Sep 02 22:45:13 2008 +0000 @@ -47,7 +47,7 @@ { 0, 0 }, }; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_AU_MUXER /* AUDIO_FILE header */ static int put_au_header(ByteIOContext *pb, AVCodecContext *enc) { @@ -103,7 +103,7 @@ return 0; } -#endif //CONFIG_MUXERS +#endif /* CONFIG_AU_MUXER */ static int au_probe(AVProbeData *p) {
--- a/dvenc.c Tue Sep 02 22:31:41 2008 +0000 +++ b/dvenc.c Tue Sep 02 22:45:13 2008 +0000 @@ -359,7 +359,7 @@ av_fifo_free(&c->audio_data[i]); } -#ifdef CONFIG_MUXERS +#ifdef CONFIG_DV_MUXER static int dv_write_header(AVFormatContext *s) { if (!dv_init_mux(s)) { @@ -397,9 +397,7 @@ dv_delete_mux(s->priv_data); return 0; } -#endif /* CONFIG_MUXERS */ -#ifdef CONFIG_DV_MUXER AVOutputFormat dv_muxer = { "dv", NULL_IF_CONFIG_SMALL("DV video format"), @@ -412,4 +410,4 @@ dv_write_packet, dv_write_trailer, }; -#endif +#endif /* CONFIG_DV_MUXER */
--- a/img2.c Tue Sep 02 22:31:41 2008 +0000 +++ b/img2.c Tue Sep 02 22:45:13 2008 +0000 @@ -303,7 +303,7 @@ } } -#ifdef CONFIG_MUXERS +#if defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER) /******************************************************/ /* image output */ @@ -368,7 +368,7 @@ return 0; } -#endif /* CONFIG_MUXERS */ +#endif /* defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER) */ /* input */ #ifdef CONFIG_IMAGE2_DEMUXER
--- a/libnut.c Tue Sep 02 22:31:41 2008 +0000 +++ b/libnut.c Tue Sep 02 22:45:13 2008 +0000 @@ -44,7 +44,7 @@ { 0, 0 }, }; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_LIBNUT_MUXER static int av_write(void * h, size_t len, const uint8_t * buf) { ByteIOContext * bc = h; put_buffer(bc, buf, len); @@ -163,7 +163,7 @@ nut_write_trailer, .flags = AVFMT_GLOBALHEADER, }; -#endif //CONFIG_MUXERS +#endif /* CONFIG_LIBNUT_MUXER */ static int nut_probe(AVProbeData *p) { if (!memcmp(p->buf, ID_STRING, ID_LENGTH)) return AVPROBE_SCORE_MAX;
--- a/mmf.c Tue Sep 02 22:31:41 2008 +0000 +++ b/mmf.c Tue Sep 02 22:45:13 2008 +0000 @@ -36,7 +36,7 @@ return mmf_rates[code]; } -#ifdef CONFIG_MUXERS +#ifdef CONFIG_MMF_MUXER static int mmf_rate_code(int rate) { int i; @@ -163,7 +163,7 @@ } return 0; } -#endif //CONFIG_MUXERS +#endif /* CONFIG_MMF_MUXER */ static int mmf_probe(AVProbeData *p) {
--- a/mp3.c Tue Sep 02 22:31:41 2008 +0000 +++ b/mp3.c Tue Sep 02 22:45:13 2008 +0000 @@ -521,7 +521,7 @@ return ret; } -#ifdef CONFIG_MUXERS +#if defined(CONFIG_MP2_MUXER) || defined(CONFIG_MP3_MUXER) static void id3v1_create_tag(AVFormatContext *s, uint8_t *buf) { int v, i; @@ -639,7 +639,7 @@ } return 0; } -#endif //CONFIG_MUXERS +#endif /* defined(CONFIG_MP2_MUXER) || defined(CONFIG_MP3_MUXER) */ #ifdef CONFIG_MP3_DEMUXER AVInputFormat mp3_demuxer = {
--- a/wav.c Tue Sep 02 22:31:41 2008 +0000 +++ b/wav.c Tue Sep 02 22:45:13 2008 +0000 @@ -30,7 +30,7 @@ int last_duration; } WAVContext; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_WAV_MUXER static int wav_write_header(AVFormatContext *s) { WAVContext *wav = s->priv_data; @@ -113,7 +113,7 @@ } return 0; } -#endif //CONFIG_MUXERS +#endif /* CONFIG_WAV_MUXER */ /* return the size of the found tag */ /* XXX: > 2GB ? */