X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Favienc.c;h=19cabe2aef77b94ebde96f4f84a5147801dea8e2;hb=f863cdef813e51d5850e2386618feafe197f06f4;hp=8a53bb53d3a349523e06f1afdd0fee4ea2b20ea8;hpb=83f9bc8aeece0d7c5b1fadaf91118ee6a97a0390;p=ffmpeg diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 8a53bb53d3a..19cabe2aef7 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -639,16 +639,20 @@ static int avi_write_trailer(AVFormatContext *s) } AVOutputFormat ff_avi_muxer = { - "avi", - NULL_IF_CONFIG_SMALL("AVI format"), - "video/x-msvideo", - "avi", - sizeof(AVIContext), - CODEC_ID_MP2, - CODEC_ID_MPEG4, - avi_write_header, - avi_write_packet, - avi_write_trailer, + .name = "avi", + .long_name = NULL_IF_CONFIG_SMALL("AVI format"), + .mime_type = "video/x-msvideo", + .extensions = "avi", + .priv_data_size = sizeof(AVIContext), +#if CONFIG_LIBMP3LAME_ENCODER + .audio_codec = CODEC_ID_MP3, +#else + .audio_codec = CODEC_ID_AC3, +#endif + .video_codec = CODEC_ID_MPEG4, + .write_header = avi_write_header, + .write_packet = avi_write_packet, + .write_trailer = avi_write_trailer, .codec_tag= (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0}, .flags= AVFMT_VARIABLE_FPS, };