give AVInput/OutputFormat structs consistent names

[ffmpeg] / libavformat / avienc.c

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index edd2ea19df15a38f82a6dace9392a442032033f9..c9b6c08d30f67baf519647100df70b020bacc495 100644 (file)
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -140,6 +140,7 @@ const CodecTag codec_bmp_tags[] = {
     { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '1') },
     { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') },
     { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') },
+    { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'E', 'G') },
     { CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') },
     { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') },
     { CODEC_ID_MPEG1VIDEO, 0x10000001 },
@@ -183,6 +184,7 @@ const CodecTag codec_bmp_tags[] = {
     { CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') },
     { CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') },
     { CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') },
+    { CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') },
     { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') },
     { CODEC_ID_TSCC, MKTAG('t', 's', 'c', 'c') },
     { CODEC_ID_ULTI, MKTAG('U', 'L', 'T', 'I') },
@@ -760,7 +762,7 @@ static int avi_write_trailer(AVFormatContext *s)
     return res;
 }
 
-static AVOutputFormat avi_oformat = {
+static AVOutputFormat avi_muxer = {
     "avi",
     "avi format",
     "video/x-msvideo",
@@ -775,7 +777,7 @@ static AVOutputFormat avi_oformat = {
 
 int avienc_init(void)
 {
-    av_register_output_format(&avi_oformat);
+    av_register_output_format(&avi_muxer);
     return 0;
 }
 #endif //CONFIG_MUXERS