From f60b54902f45bbc3a25d96e87eec3da421538010 Mon Sep 17 00:00:00 2001 From: James Almer Date: Wed, 6 Jul 2016 14:14:39 -0300 Subject: [PATCH] avformat/oggenc: make flac the default for oga muxer This allows simpler selection of flac in ogg from the command line, while following the RFC 5334 recommendation[1] for the oga extension. [1] https://tools.ietf.org/html/rfc5334#section-10.3 Reviewed-by: Michael Niedermayer Signed-off-by: James Almer --- libavformat/oggenc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index f998af39ac..fe1f34d843 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -688,8 +688,7 @@ AVOutputFormat ff_oga_muxer = { .mime_type = "audio/ogg", .extensions = "oga", .priv_data_size = sizeof(OGGContext), - .audio_codec = CONFIG_LIBVORBIS_ENCODER ? - AV_CODEC_ID_VORBIS : AV_CODEC_ID_FLAC, + .audio_codec = AV_CODEC_ID_FLAC, .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, -- 2.11.0