From d2a067d1d9011bf1015fd23efcbfb20cd4f79e1a Mon Sep 17 00:00:00 2001
From: Måns Rullgård <mans@mansr.com>
Date: Sun, 9 Jul 2006 23:40:53 +0000
Subject: give AVInput/OutputFormat structs consistent names

Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/voc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'libavformat/voc.c')

diff --git a/libavformat/voc.c b/libavformat/voc.c
index 00eeac4e32..067c899a18 100644
--- a/libavformat/voc.c
+++ b/libavformat/voc.c
@@ -173,7 +173,7 @@ static int voc_read_close(AVFormatContext *s)
     return 0;
 }
 
-static AVInputFormat voc_iformat = {
+static AVInputFormat voc_demuxer = {
     "voc",
     "Creative Voice File format",
     sizeof(voc_dec_context_t),
@@ -256,7 +256,7 @@ static int voc_write_trailer(AVFormatContext *s)
     return 0;
 }
 
-static AVOutputFormat voc_oformat = {
+static AVOutputFormat voc_muxer = {
     "voc",
     "Creative Voice File format",
     "audio/x-voc",
@@ -275,10 +275,10 @@ static AVOutputFormat voc_oformat = {
 int voc_init(void)
 {
 #ifdef CONFIG_DEMUXERS
-    av_register_input_format(&voc_iformat);
+    av_register_input_format(&voc_demuxer);
 #endif /* CONFIG_DEMUXERS */
 #ifdef CONFIG_MUXERS
-    av_register_output_format(&voc_oformat);
+    av_register_output_format(&voc_muxer);
 #endif /* CONFIG_MUXERS */
     return 0;
 }
-- 
cgit v1.2.3