summaryrefslogtreecommitdiff
path: root/libavformat/amr.c
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2006-07-09 23:40:53 +0000
committerMåns Rullgård <mans@mansr.com>2006-07-09 23:40:53 +0000
commitd2a067d1d9011bf1015fd23efcbfb20cd4f79e1a (patch)
tree859e011692e235fd60c89e25caea93c7e2d87fad /libavformat/amr.c
parent21227514de650da3de297acce893175230f04beb (diff)
give AVInput/OutputFormat structs consistent names
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/amr.c')
-rw-r--r--libavformat/amr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/amr.c b/libavformat/amr.c
index 22cd613739..b2e79420ab 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -215,7 +215,7 @@ static int amr_read_close(AVFormatContext *s)
return 0;
}
-static AVInputFormat amr_iformat = {
+static AVInputFormat amr_demuxer = {
"amr",
"3gpp amr file format",
0, /*priv_data_size*/
@@ -226,7 +226,7 @@ static AVInputFormat amr_iformat = {
};
#ifdef CONFIG_MUXERS
-static AVOutputFormat amr_oformat = {
+static AVOutputFormat amr_muxer = {
"amr",
"3gpp amr file format",
"audio/amr",
@@ -242,9 +242,9 @@ static AVOutputFormat amr_oformat = {
int amr_init(void)
{
- av_register_input_format(&amr_iformat);
+ av_register_input_format(&amr_demuxer);
#ifdef CONFIG_MUXERS
- av_register_output_format(&amr_oformat);
+ av_register_output_format(&amr_muxer);
#endif
return 0;
}