summaryrefslogtreecommitdiff
path: root/libavformat/img.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/img.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/img.c')
-rw-r--r--libavformat/img.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/img.c b/libavformat/img.c
index 888fcfa8c3..fe00cdc420 100644
--- a/libavformat/img.c
+++ b/libavformat/img.c
@@ -340,7 +340,7 @@ static int img_write_trailer(AVFormatContext *s)
/* input */
-static AVInputFormat image_iformat = {
+static AVInputFormat image_demuxer = {
"image",
"image sequence",
sizeof(VideoData),
@@ -353,7 +353,7 @@ static AVInputFormat image_iformat = {
AVFMT_NOFILE | AVFMT_NEEDNUMBER,
};
-static AVInputFormat imagepipe_iformat = {
+static AVInputFormat imagepipe_demuxer = {
"imagepipe",
"piped image sequence",
sizeof(VideoData),
@@ -367,7 +367,7 @@ static AVInputFormat imagepipe_iformat = {
/* output */
-static AVOutputFormat image_oformat = {
+static AVOutputFormat image_muxer = {
"image",
"image sequence",
"",
@@ -382,7 +382,7 @@ static AVOutputFormat image_oformat = {
img_set_parameters,
};
-static AVOutputFormat imagepipe_oformat = {
+static AVOutputFormat imagepipe_muxer = {
"imagepipe",
"piped image sequence",
"",
@@ -399,11 +399,11 @@ static AVOutputFormat imagepipe_oformat = {
int img_init(void)
{
- av_register_input_format(&image_iformat);
- av_register_output_format(&image_oformat);
+ av_register_input_format(&image_demuxer);
+ av_register_output_format(&image_muxer);
- av_register_input_format(&imagepipe_iformat);
- av_register_output_format(&imagepipe_oformat);
+ av_register_input_format(&imagepipe_demuxer);
+ av_register_output_format(&imagepipe_muxer);
return 0;
}