aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2016-07-06 14:14:39 -0300
committerJames Almer <jamrial@gmail.com>2016-07-11 13:08:19 -0300
commitf60b54902f45bbc3a25d96e87eec3da421538010 (patch)
treea42fe018d1346ec30ae95fd5967cc174101c8b4f
parent70d418c7e6af082933930a0ca0241bd16ebf1a8f (diff)
downloadffmpeg-f60b54902f45bbc3a25d96e87eec3da421538010.tar.gz
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 <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavformat/oggenc.c3
1 files changed, 1 insertions, 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,