summaryrefslogtreecommitdiff
path: root/libavformat/mpjpeg.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/mpjpeg.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/mpjpeg.c')
-rw-r--r--libavformat/mpjpeg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c
index b1621cfa5b..2f2da0586a 100644
--- a/libavformat/mpjpeg.c
+++ b/libavformat/mpjpeg.c
@@ -52,7 +52,7 @@ static int mpjpeg_write_trailer(AVFormatContext *s)
return 0;
}
-static AVOutputFormat mpjpeg_format = {
+static AVOutputFormat mpjpeg_muxer = {
"mpjpeg",
"Mime multipart JPEG format",
"multipart/x-mixed-replace;boundary=" BOUNDARY_TAG,
@@ -67,7 +67,7 @@ static AVOutputFormat mpjpeg_format = {
int jpeg_init(void)
{
- av_register_output_format(&mpjpeg_format);
+ av_register_output_format(&mpjpeg_muxer);
return 0;
}
#endif //CONFIG_MUXERS