diff raw.c @ 1167:d89d7ef290da libavformat

give AVInput/OutputFormat structs consistent names

--- a/raw.c	Sun Jul 09 10:33:49 2006 +0000
+++ b/raw.c	Sun Jul 09 23:40:53 2006 +0000
@@ -389,7 +389,7 @@
     return 0;
 }
 
-AVInputFormat shorten_iformat = {
+AVInputFormat shorten_demuxer = {
     "shn",
     "raw shorten",
     0,
@@ -400,7 +400,7 @@
     .extensions = "shn",
 };
 
-AVInputFormat flac_iformat = {
+AVInputFormat flac_demuxer = {
     "flac",
     "raw flac",
     0,
@@ -412,7 +412,7 @@
 };
 
 #ifdef CONFIG_MUXERS
-AVOutputFormat flac_oformat = {
+AVOutputFormat flac_muxer = {
     "flac",
     "raw flac",
     "audio/x-flac",
@@ -426,7 +426,7 @@
 };
 #endif //CONFIG_MUXERS
 
-AVInputFormat ac3_iformat = {
+AVInputFormat ac3_demuxer = {
     "ac3",
     "raw ac3",
     0,
@@ -438,7 +438,7 @@
 };
 
 #ifdef CONFIG_MUXERS
-AVOutputFormat ac3_oformat = {
+AVOutputFormat ac3_muxer = {
     "ac3",
     "raw ac3",
     "audio/x-ac3",
@@ -452,7 +452,7 @@
 };
 #endif //CONFIG_MUXERS
 
-AVInputFormat dts_iformat = {
+AVInputFormat dts_demuxer = {
     "dts",
     "raw dts",
     0,
@@ -463,7 +463,7 @@
     .extensions = "dts",
 };
 
-AVInputFormat aac_iformat = {
+AVInputFormat aac_demuxer = {
     "aac",
     "ADTS AAC",
     0,
@@ -474,7 +474,7 @@
     .extensions = "aac",
 };
 
-AVInputFormat h261_iformat = {
+AVInputFormat h261_demuxer = {
     "h261",
     "raw h261",
     0,
@@ -487,7 +487,7 @@
 };
 
 #ifdef CONFIG_MUXERS
-AVOutputFormat h261_oformat = {
+AVOutputFormat h261_muxer = {
     "h261",
     "raw h261",
     "video/x-h261",
@@ -501,7 +501,7 @@
 };
 #endif //CONFIG_MUXERS
 
-AVInputFormat h263_iformat = {
+AVInputFormat h263_demuxer = {
     "h263",
     "raw h263",
     0,
@@ -514,7 +514,7 @@
 };
 
 #ifdef CONFIG_MUXERS
-AVOutputFormat h263_oformat = {
+AVOutputFormat h263_muxer = {
     "h263",
     "raw h263",
     "video/x-h263",
@@ -528,7 +528,7 @@
 };
 #endif //CONFIG_MUXERS
 
-AVInputFormat m4v_iformat = {
+AVInputFormat m4v_demuxer = {
     "m4v",
     "raw MPEG4 video format",
     0,
@@ -541,7 +541,7 @@
 };
 
 #ifdef CONFIG_MUXERS
-AVOutputFormat m4v_oformat = {
+AVOutputFormat m4v_muxer = {
     "m4v",
     "raw MPEG4 video format",
     NULL,
@@ -555,7 +555,7 @@
 };
 #endif //CONFIG_MUXERS
 
-AVInputFormat h264_iformat = {
+AVInputFormat h264_demuxer = {
     "h264",
     "raw H264 video format",
     0,
@@ -568,7 +568,7 @@
 };
 
 #ifdef CONFIG_MUXERS
-AVOutputFormat h264_oformat = {
+AVOutputFormat h264_muxer = {
     "h264",
     "raw H264 video format",
     NULL,
@@ -582,7 +582,7 @@
 };
 #endif //CONFIG_MUXERS
 
-AVInputFormat mpegvideo_iformat = {
+AVInputFormat mpegvideo_demuxer = {
     "mpegvideo",
     "MPEG video",
     0,
@@ -594,7 +594,7 @@
 };
 
 #ifdef CONFIG_MUXERS
-AVOutputFormat mpeg1video_oformat = {
+AVOutputFormat mpeg1video_muxer = {
     "mpeg1video",
     "MPEG video",
     "video/x-mpeg",
@@ -609,7 +609,7 @@
 #endif //CONFIG_MUXERS
 
 #ifdef CONFIG_MUXERS
-AVOutputFormat mpeg2video_oformat = {
+AVOutputFormat mpeg2video_muxer = {
     "mpeg2video",
     "MPEG2 video",
     NULL,
@@ -623,7 +623,7 @@
 };
 #endif //CONFIG_MUXERS
 
-AVInputFormat mjpeg_iformat = {
+AVInputFormat mjpeg_demuxer = {
     "mjpeg",
     "MJPEG video",
     0,
@@ -635,7 +635,7 @@
     .value = CODEC_ID_MJPEG,
 };
 
-AVInputFormat ingenient_iformat = {
+AVInputFormat ingenient_demuxer = {
     "ingenient",
     "Ingenient MJPEG",
     0,
@@ -648,7 +648,7 @@
 };
 
 #ifdef CONFIG_MUXERS
-AVOutputFormat mjpeg_oformat = {
+AVOutputFormat mjpeg_muxer = {
     "mjpeg",
     "MJPEG video",
     "video/x-mjpeg",
@@ -665,7 +665,7 @@
 /* pcm formats */
 
 #define PCMINPUTDEF(name, long_name, ext, codec) \
-AVInputFormat pcm_ ## name ## _iformat = {\
+AVInputFormat pcm_ ## name ## _demuxer = {\
     #name,\
     long_name,\
     0,\
@@ -679,7 +679,7 @@
 };
 
 #define PCMOUTPUTDEF(name, long_name, ext, codec) \
-AVOutputFormat pcm_ ## name ## _oformat = {\
+AVOutputFormat pcm_ ## name ## _muxer = {\
     #name,\
     long_name,\
     NULL,\
@@ -762,7 +762,7 @@
     }
 }
 
-AVInputFormat rawvideo_iformat = {
+AVInputFormat rawvideo_demuxer = {
     "rawvideo",
     "raw video format",
     0,
@@ -775,7 +775,7 @@
 };
 
 #ifdef CONFIG_MUXERS
-AVOutputFormat rawvideo_oformat = {
+AVOutputFormat rawvideo_muxer = {
     "rawvideo",
     "raw video format",
     NULL,
@@ -795,7 +795,7 @@
     return 0;
 }
 
-AVOutputFormat null_oformat = {
+AVOutputFormat null_muxer = {
     "null",
     "null video format",
     NULL,
@@ -824,59 +824,59 @@
 int raw_init(void)
 {
 
-    av_register_input_format(&shorten_iformat);
-    av_register_input_format(&flac_iformat);
-    av_register_output_format(&flac_oformat);
+    av_register_input_format(&shorten_demuxer);
+    av_register_input_format(&flac_demuxer);
+    av_register_output_format(&flac_muxer);
 
-    av_register_input_format(&ac3_iformat);
-    av_register_output_format(&ac3_oformat);
+    av_register_input_format(&ac3_demuxer);
+    av_register_output_format(&ac3_muxer);
 
-    av_register_input_format(&aac_iformat);
+    av_register_input_format(&aac_demuxer);
 
-    av_register_input_format(&dts_iformat);
+    av_register_input_format(&dts_demuxer);
 
-    av_register_input_format(&h261_iformat);
-    av_register_output_format(&h261_oformat);
+    av_register_input_format(&h261_demuxer);
+    av_register_output_format(&h261_muxer);
 
-    av_register_input_format(&h263_iformat);
-    av_register_output_format(&h263_oformat);
+    av_register_input_format(&h263_demuxer);
+    av_register_output_format(&h263_muxer);
 
-    av_register_input_format(&m4v_iformat);
-    av_register_output_format(&m4v_oformat);
+    av_register_input_format(&m4v_demuxer);
+    av_register_output_format(&m4v_muxer);
 
-    av_register_input_format(&h264_iformat);
-    av_register_output_format(&h264_oformat);
+    av_register_input_format(&h264_demuxer);
+    av_register_output_format(&h264_muxer);
 
-    av_register_input_format(&mpegvideo_iformat);
-    av_register_output_format(&mpeg1video_oformat);
+    av_register_input_format(&mpegvideo_demuxer);
+    av_register_output_format(&mpeg1video_muxer);
 
-    av_register_output_format(&mpeg2video_oformat);
+    av_register_output_format(&mpeg2video_muxer);
 
-    av_register_input_format(&mjpeg_iformat);
-    av_register_output_format(&mjpeg_oformat);
+    av_register_input_format(&mjpeg_demuxer);
+    av_register_output_format(&mjpeg_muxer);
 
-    av_register_input_format(&ingenient_iformat);
+    av_register_input_format(&ingenient_demuxer);
 
-    av_register_input_format(&pcm_s16le_iformat);
-    av_register_output_format(&pcm_s16le_oformat);
-    av_register_input_format(&pcm_s16be_iformat);
-    av_register_output_format(&pcm_s16be_oformat);
-    av_register_input_format(&pcm_u16le_iformat);
-    av_register_output_format(&pcm_u16le_oformat);
-    av_register_input_format(&pcm_u16be_iformat);
-    av_register_output_format(&pcm_u16be_oformat);
-    av_register_input_format(&pcm_s8_iformat);
-    av_register_output_format(&pcm_s8_oformat);
-    av_register_input_format(&pcm_u8_iformat);
-    av_register_output_format(&pcm_u8_oformat);
-    av_register_input_format(&pcm_mulaw_iformat);
-    av_register_output_format(&pcm_mulaw_oformat);
-    av_register_input_format(&pcm_alaw_iformat);
-    av_register_output_format(&pcm_alaw_oformat);
+    av_register_input_format(&pcm_s16le_demuxer);
+    av_register_output_format(&pcm_s16le_muxer);
+    av_register_input_format(&pcm_s16be_demuxer);
+    av_register_output_format(&pcm_s16be_muxer);
+    av_register_input_format(&pcm_u16le_demuxer);
+    av_register_output_format(&pcm_u16le_muxer);
+    av_register_input_format(&pcm_u16be_demuxer);
+    av_register_output_format(&pcm_u16be_muxer);
+    av_register_input_format(&pcm_s8_demuxer);
+    av_register_output_format(&pcm_s8_muxer);
+    av_register_input_format(&pcm_u8_demuxer);
+    av_register_output_format(&pcm_u8_muxer);
+    av_register_input_format(&pcm_mulaw_demuxer);
+    av_register_output_format(&pcm_mulaw_muxer);
+    av_register_input_format(&pcm_alaw_demuxer);
+    av_register_output_format(&pcm_alaw_muxer);
 
-    av_register_input_format(&rawvideo_iformat);
-    av_register_output_format(&rawvideo_oformat);
+    av_register_input_format(&rawvideo_demuxer);
+    av_register_output_format(&rawvideo_muxer);
 
-    av_register_output_format(&null_oformat);
+    av_register_output_format(&null_muxer);
     return 0;
 }