diff options
| author | Diego Biurrun <diego@biurrun.de> | 2005-09-23 00:25:41 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2005-09-23 00:25:41 +0000 |
| commit | a9e350952992f07f4b560385185f406fbbb752d7 (patch) | |
| tree | 05d33876774bc092ffee92ecabd160ae3dc2205c /libavformat/mpeg.c | |
| parent | 288f1e6815fc52196fd1f443d305a4822bf371a2 (diff) | |
| download | ffmpeg-a9e350952992f07f4b560385185f406fbbb752d7.tar.gz | |
Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
in libavformat to allow building (de)coders and (de)muxers independently at
some point + support for this option in configure.
Originally committed as revision 4611 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mpeg.c')
| -rw-r--r-- | libavformat/mpeg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index a597495ef4..1e4d2a79f1 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -107,7 +107,7 @@ typedef struct { static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat mpeg1system_mux; static AVOutputFormat mpeg1vcd_mux; static AVOutputFormat mpeg2vob_mux; @@ -1253,7 +1253,7 @@ static int mpeg_mux_end(AVFormatContext *ctx) } return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /*********************************************/ /* demux code */ @@ -1707,7 +1707,7 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index, return dts; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat mpeg1system_mux = { "mpeg", "MPEG1 System format", @@ -1775,7 +1775,7 @@ static AVOutputFormat mpeg2dvd_mux = { mpeg_mux_end, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat mpegps_demux = { "mpeg", @@ -1792,13 +1792,13 @@ AVInputFormat mpegps_demux = { int mpegps_init(void) { -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&mpeg1system_mux); av_register_output_format(&mpeg1vcd_mux); av_register_output_format(&mpeg2vob_mux); av_register_output_format(&mpeg2svcd_mux); av_register_output_format(&mpeg2dvd_mux); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS av_register_input_format(&mpegps_demux); return 0; } |