Revision 8212568a

View differences:

libavformat/aiff.c
166 166
    return num_frames;
167 167
}
168 168

  
169
#ifdef CONFIG_MUXERS
169
#ifdef CONFIG_AIFF_MUXER
170 170
typedef struct {
171 171
    offset_t form;
172 172
    offset_t frames;
......
289 289

  
290 290
    return 0;
291 291
}
292
#endif //CONFIG_MUXERS
292
#endif /* CONFIG_AIFF_MUXER */
293 293

  
294 294
static int aiff_probe(AVProbeData *p)
295 295
{
libavformat/amr.c
30 30
static const char AMR_header [] = "#!AMR\n";
31 31
static const char AMRWB_header [] = "#!AMR-WB\n";
32 32

  
33
#ifdef CONFIG_MUXERS
33
#ifdef CONFIG_AMR_MUXER
34 34
static int amr_write_header(AVFormatContext *s)
35 35
{
36 36
    ByteIOContext *pb = s->pb;
......
60 60
    put_flush_packet(s->pb);
61 61
    return 0;
62 62
}
63
#endif /* CONFIG_MUXERS */
63
#endif /* CONFIG_AMR_MUXER */
64 64

  
65 65
static int amr_probe(AVProbeData *p)
66 66
{
libavformat/au.c
47 47
    { 0, 0 },
48 48
};
49 49

  
50
#ifdef CONFIG_MUXERS
50
#ifdef CONFIG_AU_MUXER
51 51
/* AUDIO_FILE header */
52 52
static int put_au_header(ByteIOContext *pb, AVCodecContext *enc)
53 53
{
......
103 103

  
104 104
    return 0;
105 105
}
106
#endif //CONFIG_MUXERS
106
#endif /* CONFIG_AU_MUXER */
107 107

  
108 108
static int au_probe(AVProbeData *p)
109 109
{
libavformat/dvenc.c
359 359
        av_fifo_free(&c->audio_data[i]);
360 360
}
361 361

  
362
#ifdef CONFIG_MUXERS
362
#ifdef CONFIG_DV_MUXER
363 363
static int dv_write_header(AVFormatContext *s)
364 364
{
365 365
    if (!dv_init_mux(s)) {
......
397 397
    dv_delete_mux(s->priv_data);
398 398
    return 0;
399 399
}
400
#endif /* CONFIG_MUXERS */
401 400

  
402
#ifdef CONFIG_DV_MUXER
403 401
AVOutputFormat dv_muxer = {
404 402
    "dv",
405 403
    NULL_IF_CONFIG_SMALL("DV video format"),
......
412 410
    dv_write_packet,
413 411
    dv_write_trailer,
414 412
};
415
#endif
413
#endif /* CONFIG_DV_MUXER */
libavformat/img2.c
303 303
    }
304 304
}
305 305

  
306
#ifdef CONFIG_MUXERS
306
#if defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER)
307 307
/******************************************************/
308 308
/* image output */
309 309

  
......
368 368
    return 0;
369 369
}
370 370

  
371
#endif /* CONFIG_MUXERS */
371
#endif /* defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER) */
372 372

  
373 373
/* input */
374 374
#ifdef CONFIG_IMAGE2_DEMUXER
libavformat/libnut.c
44 44
    { 0, 0 },
45 45
};
46 46

  
47
#ifdef CONFIG_MUXERS
47
#ifdef CONFIG_LIBNUT_MUXER
48 48
static int av_write(void * h, size_t len, const uint8_t * buf) {
49 49
    ByteIOContext * bc = h;
50 50
    put_buffer(bc, buf, len);
......
163 163
    nut_write_trailer,
164 164
    .flags = AVFMT_GLOBALHEADER,
165 165
};
166
#endif //CONFIG_MUXERS
166
#endif /* CONFIG_LIBNUT_MUXER */
167 167

  
168 168
static int nut_probe(AVProbeData *p) {
169 169
    if (!memcmp(p->buf, ID_STRING, ID_LENGTH)) return AVPROBE_SCORE_MAX;
libavformat/mmf.c
36 36
    return mmf_rates[code];
37 37
}
38 38

  
39
#ifdef CONFIG_MUXERS
39
#ifdef CONFIG_MMF_MUXER
40 40
static int mmf_rate_code(int rate)
41 41
{
42 42
    int i;
......
163 163
    }
164 164
    return 0;
165 165
}
166
#endif //CONFIG_MUXERS
166
#endif /* CONFIG_MMF_MUXER */
167 167

  
168 168
static int mmf_probe(AVProbeData *p)
169 169
{
libavformat/mp3.c
521 521
    return ret;
522 522
}
523 523

  
524
#ifdef CONFIG_MUXERS
524
#if defined(CONFIG_MP2_MUXER) || defined(CONFIG_MP3_MUXER)
525 525
static void id3v1_create_tag(AVFormatContext *s, uint8_t *buf)
526 526
{
527 527
    int v, i;
......
639 639
    }
640 640
    return 0;
641 641
}
642
#endif //CONFIG_MUXERS
642
#endif /* defined(CONFIG_MP2_MUXER) || defined(CONFIG_MP3_MUXER) */
643 643

  
644 644
#ifdef CONFIG_MP3_DEMUXER
645 645
AVInputFormat mp3_demuxer = {
libavformat/wav.c
30 30
    int last_duration;
31 31
} WAVContext;
32 32

  
33
#ifdef CONFIG_MUXERS
33
#ifdef CONFIG_WAV_MUXER
34 34
static int wav_write_header(AVFormatContext *s)
35 35
{
36 36
    WAVContext *wav = s->priv_data;
......
113 113
    }
114 114
    return 0;
115 115
}
116
#endif //CONFIG_MUXERS
116
#endif /* CONFIG_WAV_MUXER */
117 117

  
118 118
/* return the size of the found tag */
119 119
/* XXX: > 2GB ? */

Also available in: Unified diff