MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace generic CONFIG_MUXERS preprocessor conditionals by more specific

Browse Source 
CONFIG_FOO_MUXER conditionals where appropriate.

Originally committed as revision 15158 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2008-09-02 22:45:13 +00:00
parent c184318852
commit 8212568a1c
9 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/aiff.c
View File

@ -166,7 +166,7 @@ static unsigned int get_aiff_header(ByteIOContext *pb, AVCodecContext *codec,
return num_frames;
}
#ifdef CONFIG_MUXERS
#ifdef CONFIG_AIFF_MUXER
typedef struct {
offset_t form;
offset_t frames;
@ -289,7 +289,7 @@ static int aiff_write_trailer(AVFormatContext *s)
return 0;
}
#endif //CONFIG_MUXERS
#endif /* CONFIG_AIFF_MUXER */
static int aiff_probe(AVProbeData *p)
{

4
libavformat/amr.c
View File

@ -30,7 +30,7 @@ Only mono files are supported.
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 @@ static int amr_write_packet(AVFormatContext *s, AVPacket *pkt)
put_flush_packet(s->pb);
return 0;
}
#endif /* CONFIG_MUXERS */
#endif /* CONFIG_AMR_MUXER */
static int amr_probe(AVProbeData *p)
{

4
libavformat/au.c
View File

@ -47,7 +47,7 @@ static const AVCodecTag codec_au_tags[] = {
{ 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 @@ static int au_write_trailer(AVFormatContext *s)
return 0;
}
#endif //CONFIG_MUXERS
#endif /* CONFIG_AU_MUXER */
static int au_probe(AVProbeData *p)
{

6
libavformat/dvenc.c
View File

@ -359,7 +359,7 @@ void dv_delete_mux(DVMuxContext *c)
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 @@ static int dv_write_trailer(struct AVFormatContext *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"),
@ -412,4 +410,4 @@ AVOutputFormat dv_muxer = {
dv_write_packet,
dv_write_trailer,
};
#endif
#endif /* CONFIG_DV_MUXER */

4
libavformat/img2.c
View File

@ -303,7 +303,7 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
}
}
#ifdef CONFIG_MUXERS
#if defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER)
/******************************************************/
/* image output */
@ -368,7 +368,7 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0;
}
#endif /* CONFIG_MUXERS */
#endif /* defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER) */
/* input */
#ifdef CONFIG_IMAGE2_DEMUXER

4
libavformat/libnut.c
View File

@ -44,7 +44,7 @@ static const AVCodecTag nut_tags[] = {
{ 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 @@ AVOutputFormat libnut_muxer = {
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;

4
libavformat/mmf.c
View File

@ -36,7 +36,7 @@ static int mmf_rate(int code)
return mmf_rates[code];
}
#ifdef CONFIG_MUXERS
#ifdef CONFIG_MMF_MUXER
static int mmf_rate_code(int rate)
{
int i;
@ -163,7 +163,7 @@ static int mmf_write_trailer(AVFormatContext *s)
}
return 0;
}
#endif //CONFIG_MUXERS
#endif /* CONFIG_MMF_MUXER */
static int mmf_probe(AVProbeData *p)
{

4
libavformat/mp3.c
View File

@ -521,7 +521,7 @@ static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt)
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 @@ static int mp3_write_trailer(struct AVFormatContext *s)
}
return 0;
}
#endif //CONFIG_MUXERS
#endif /* defined(CONFIG_MP2_MUXER) || defined(CONFIG_MP3_MUXER) */
#ifdef CONFIG_MP3_DEMUXER
AVInputFormat mp3_demuxer = {

4
libavformat/wav.c
View File

@ -30,7 +30,7 @@ typedef struct {
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 @@ static int wav_write_trailer(AVFormatContext *s)
}
return 0;
}
#endif //CONFIG_MUXERS
#endif /* CONFIG_WAV_MUXER */
/* return the size of the found tag */
/* XXX: > 2GB ? */