X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Foggenc.c;h=73b311dd3a8b96835975c29f71ac687c2935c36b;hb=23c1db9b83b5928a312b8d7cd753d04d49c252b6;hp=5d1f3203513e71e825e804ca2bba1d5290517147;hpb=721be993713550e7f1c3bccf670fd0a1be7e7738;p=ffmpeg diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 5d1f3203513..73b311dd3a8 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -21,6 +21,7 @@ #include "libavutil/crc.h" #include "libavutil/opt.h" +#include "libavutil/mathematics.h" #include "libavutil/random_seed.h" #include "libavcodec/xiph.h" #include "libavcodec/bytestream.h" @@ -71,7 +72,7 @@ typedef struct { static const AVOption options[] = { { "oggpagesize", "Set preferred Ogg page size.", - offsetof(OGGContext, pref_size), FF_OPT_TYPE_INT, 0, 0, MAX_PAGE_SIZE, AV_OPT_FLAG_ENCODING_PARAM}, + offsetof(OGGContext, pref_size), FF_OPT_TYPE_INT, {.dbl = 0}, 0, MAX_PAGE_SIZE, AV_OPT_FLAG_ENCODING_PARAM}, { NULL }, }; @@ -524,15 +525,15 @@ static int ogg_write_trailer(AVFormatContext *s) } AVOutputFormat ff_ogg_muxer = { - "ogg", - NULL_IF_CONFIG_SMALL("Ogg"), - "application/ogg", - "ogg,ogv,spx", - sizeof(OGGContext), - CODEC_ID_FLAC, - CODEC_ID_THEORA, - ogg_write_header, - ogg_write_packet, - ogg_write_trailer, + .name = "ogg", + .long_name = NULL_IF_CONFIG_SMALL("Ogg"), + .mime_type = "application/ogg", + .extensions = "ogg,ogv,spx", + .priv_data_size = sizeof(OGGContext), + .audio_codec = CODEC_ID_FLAC, + .video_codec = CODEC_ID_THEORA, + .write_header = ogg_write_header, + .write_packet = ogg_write_packet, + .write_trailer = ogg_write_trailer, .priv_class = &ogg_muxer_class, };