summaryrefslogtreecommitdiff
path: root/libavformat/mpegts.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/mpegts.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/mpegts.c')
-rw-r--r--libavformat/mpegts.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 7076fb1234..177576013f 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1511,7 +1511,7 @@ void mpegts_parse_close(MpegTSContext *ts)
av_free(ts);
}
-AVInputFormat mpegts_demux = {
+AVInputFormat mpegts_demuxer = {
"mpegts",
"MPEG2 transport stream format",
sizeof(MpegTSContext),
@@ -1526,9 +1526,9 @@ AVInputFormat mpegts_demux = {
int mpegts_init(void)
{
- av_register_input_format(&mpegts_demux);
+ av_register_input_format(&mpegts_demuxer);
#ifdef CONFIG_MUXERS
- av_register_output_format(&mpegts_mux);
+ av_register_output_format(&mpegts_muxer);
#endif
return 0;
}