diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-07-09 23:40:53 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-07-09 23:40:53 +0000 |
| commit | d2a067d1d9011bf1015fd23efcbfb20cd4f79e1a (patch) | |
| tree | 859e011692e235fd60c89e25caea93c7e2d87fad /libavformat/mp3.c | |
| parent | 21227514de650da3de297acce893175230f04beb (diff) | |
| download | ffmpeg-d2a067d1d9011bf1015fd23efcbfb20cd4f79e1a.tar.gz | |
give AVInput/OutputFormat structs consistent names
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mp3.c')
| -rw-r--r-- | libavformat/mp3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/mp3.c b/libavformat/mp3.c index 37bb3251be..cdf02dc88b 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -368,7 +368,7 @@ static int mp3_write_trailer(struct AVFormatContext *s) } #endif //CONFIG_MUXERS -AVInputFormat mp3_iformat = { +AVInputFormat mp3_demuxer = { "mp3", "MPEG audio", 0, @@ -380,7 +380,7 @@ AVInputFormat mp3_iformat = { }; #ifdef CONFIG_MUXERS -AVOutputFormat mp2_oformat = { +AVOutputFormat mp2_muxer = { "mp2", "MPEG audio layer 2", "audio/x-mpeg", @@ -398,7 +398,7 @@ AVOutputFormat mp2_oformat = { }; #ifdef CONFIG_MP3LAME -AVOutputFormat mp3_oformat = { +AVOutputFormat mp3_muxer = { "mp3", "MPEG audio layer 3", "audio/x-mpeg", @@ -415,11 +415,11 @@ AVOutputFormat mp3_oformat = { int mp3_init(void) { - av_register_input_format(&mp3_iformat); + av_register_input_format(&mp3_demuxer); #ifdef CONFIG_MUXERS - av_register_output_format(&mp2_oformat); + av_register_output_format(&mp2_muxer); #ifdef CONFIG_MP3LAME - av_register_output_format(&mp3_oformat); + av_register_output_format(&mp3_muxer); #endif #endif //CONFIG_MUXERS return 0; |