give AVInput/OutputFormat structs consistent names

Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 6 insertions, 6 deletions

diff --git a/libavformat/asf.c b/libavformat/asf.c
index fd0da6ed3a..88a0680948 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -840,7 +840,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int
     return 0;
 }
 
-static AVInputFormat asf_iformat = {
+static AVInputFormat asf_demuxer = {
     "asf",
     "asf format",
     sizeof(ASFContext),
@@ -853,16 +853,16 @@ static AVInputFormat asf_iformat = {
 };
 
 #ifdef CONFIG_MUXERS
-    extern AVOutputFormat asf_oformat;
-    extern AVOutputFormat asf_stream_oformat;
+    extern AVOutputFormat asf_muxer;
+    extern AVOutputFormat asf_stream_muxer;
 #endif //CONFIG_MUXERS
 
 int asf_init(void)
 {
-    av_register_input_format(&asf_iformat);
+    av_register_input_format(&asf_demuxer);
 #ifdef CONFIG_MUXERS
-    av_register_output_format(&asf_oformat);
-    av_register_output_format(&asf_stream_oformat);
+    av_register_output_format(&asf_muxer);
+    av_register_output_format(&asf_stream_muxer);
 #endif //CONFIG_MUXERS
     return 0;
 }