summaryrefslogtreecommitdiff
path: root/libavformat/allformats.h
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/allformats.h
parent21227514de650da3de297acce893175230f04beb (diff)
give AVInput/OutputFormat structs consistent names
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/allformats.h')
-rw-r--r--libavformat/allformats.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/allformats.h b/libavformat/allformats.h
index 316642d8b5..41c0446d47 100644
--- a/libavformat/allformats.h
+++ b/libavformat/allformats.h
@@ -2,11 +2,11 @@
#define ALLFORMATS_H
/* mpeg.c */
-extern AVInputFormat mpegps_demux;
+extern AVInputFormat mpegps_demuxer;
int mpegps_init(void);
/* mpegts.c */
-extern AVInputFormat mpegts_demux;
+extern AVInputFormat mpegts_demuxer;
int mpegts_init(void);
/* rm.c */
@@ -87,7 +87,7 @@ int ff_dv_init(void);
int ffm_init(void);
/* rtsp.c */
-extern AVInputFormat redir_demux;
+extern AVInputFormat redir_demuxer;
int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f);
/* 4xm.c */