diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-07-09 23:40:53 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-07-09 23:40:53 +0000 |
| commit | d2a067d1d9011bf1015fd23efcbfb20cd4f79e1a (patch) | |
| tree | 859e011692e235fd60c89e25caea93c7e2d87fad /libavformat/movenc.c | |
| parent | 21227514de650da3de297acce893175230f04beb (diff) | |
| download | ffmpeg-streaming-d2a067d1d9011bf1015fd23efcbfb20cd4f79e1a.zip ffmpeg-streaming-d2a067d1d9011bf1015fd23efcbfb20cd4f79e1a.tar.gz | |
give AVInput/OutputFormat structs consistent names
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 30e3b00..e6241d6 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1588,7 +1588,7 @@ static int mov_write_trailer(AVFormatContext *s) return res; } -static AVOutputFormat mov_oformat = { +static AVOutputFormat mov_muxer = { "mov", "mov format", NULL, @@ -1602,7 +1602,7 @@ static AVOutputFormat mov_oformat = { .flags = AVFMT_GLOBALHEADER, }; -static AVOutputFormat _3gp_oformat = { +static AVOutputFormat _3gp_muxer = { "3gp", "3gp format", NULL, @@ -1616,7 +1616,7 @@ static AVOutputFormat _3gp_oformat = { .flags = AVFMT_GLOBALHEADER, }; -static AVOutputFormat mp4_oformat = { +static AVOutputFormat mp4_muxer = { "mp4", "mp4 format", "application/mp4", @@ -1630,7 +1630,7 @@ static AVOutputFormat mp4_oformat = { .flags = AVFMT_GLOBALHEADER, }; -static AVOutputFormat psp_oformat = { +static AVOutputFormat psp_muxer = { "psp", "psp mp4 format", NULL, @@ -1644,7 +1644,7 @@ static AVOutputFormat psp_oformat = { .flags = AVFMT_GLOBALHEADER, }; -static AVOutputFormat _3g2_oformat = { +static AVOutputFormat _3g2_muxer = { "3g2", "3gp2 format", NULL, @@ -1660,10 +1660,10 @@ static AVOutputFormat _3g2_oformat = { int movenc_init(void) { - av_register_output_format(&mov_oformat); - av_register_output_format(&_3gp_oformat); - av_register_output_format(&mp4_oformat); - av_register_output_format(&psp_oformat); - av_register_output_format(&_3g2_oformat); + av_register_output_format(&mov_muxer); + av_register_output_format(&_3gp_muxer); + av_register_output_format(&mp4_muxer); + av_register_output_format(&psp_muxer); + av_register_output_format(&_3g2_muxer); return 0; } |
