CONFIG_FOO_MUXER conditionals where appropriate.
Originally committed as revision 15158 to svn://svn.ffmpeg.org/ffmpeg/trunk
return num_frames;
}
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_AIFF_MUXER
typedef struct {
offset_t form;
offset_t frames;
return 0;
}
-#endif //CONFIG_MUXERS
+#endif /* CONFIG_AIFF_MUXER */
static int aiff_probe(AVProbeData *p)
{
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;
put_flush_packet(s->pb);
return 0;
}
-#endif /* CONFIG_MUXERS */
+#endif /* CONFIG_AMR_MUXER */
static int amr_probe(AVProbeData *p)
{
{ 0, 0 },
};
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_AU_MUXER
/* AUDIO_FILE header */
static int put_au_header(ByteIOContext *pb, AVCodecContext *enc)
{
return 0;
}
-#endif //CONFIG_MUXERS
+#endif /* CONFIG_AU_MUXER */
static int au_probe(AVProbeData *p)
{
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)) {
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"),
dv_write_packet,
dv_write_trailer,
};
-#endif
+#endif /* CONFIG_DV_MUXER */
}
}
-#ifdef CONFIG_MUXERS
+#if defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER)
/******************************************************/
/* image output */
return 0;
}
-#endif /* CONFIG_MUXERS */
+#endif /* defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER) */
/* input */
#ifdef CONFIG_IMAGE2_DEMUXER
{ 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);
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;
return mmf_rates[code];
}
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_MMF_MUXER
static int mmf_rate_code(int rate)
{
int i;
}
return 0;
}
-#endif //CONFIG_MUXERS
+#endif /* CONFIG_MMF_MUXER */
static int mmf_probe(AVProbeData *p)
{
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;
}
return 0;
}
-#endif //CONFIG_MUXERS
+#endif /* defined(CONFIG_MP2_MUXER) || defined(CONFIG_MP3_MUXER) */
#ifdef CONFIG_MP3_DEMUXER
AVInputFormat mp3_demuxer = {
int last_duration;
} WAVContext;
-#ifdef CONFIG_MUXERS
+#ifdef CONFIG_WAV_MUXER
static int wav_write_header(AVFormatContext *s)
{
WAVContext *wav = s->priv_data;
}
return 0;
}
-#endif //CONFIG_MUXERS
+#endif /* CONFIG_WAV_MUXER */
/* return the size of the found tag */
/* XXX: > 2GB ? */