[FFmpeg-cvslog] avformat/oggenc: make flac the default for oga muxer

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Jul  6 14:14:39 2016 -0300| [f60b54902f45bbc3a25d96e87eec3da421538010] | committer: James Almer

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 at niedermayer.cc>
Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f60b54902f45bbc3a25d96e87eec3da421538010
---

 libavformat/oggenc.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index f998af3..fe1f34d 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,