lavf: default .ogg audio to libvorbis if we can
authorAndrew Kelley <superjoe30@gmail.com>
Sat, 8 Feb 2014 16:18:57 +0000 (16:18 +0000)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Sun, 9 Feb 2014 17:36:15 +0000 (18:36 +0100)
Since 2007, the Xiph.org Foundation recommends that .ogg only be used
for Ogg Vorbis audio files.

Source: http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions

However we only do it if we have libvorbis available because the
built in vorbis encoder is not as good.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
libavformat/oggenc.c

index e96cde7..fd102c8 100644 (file)
@@ -616,7 +616,8 @@ AVOutputFormat ff_ogg_muxer = {
     .mime_type         = "application/ogg",
     .extensions        = "ogg,ogv,spx,opus",
     .priv_data_size    = sizeof(OGGContext),
     .mime_type         = "application/ogg",
     .extensions        = "ogg,ogv,spx,opus",
     .priv_data_size    = sizeof(OGGContext),
-    .audio_codec       = AV_CODEC_ID_FLAC,
+    .audio_codec       = CONFIG_LIBVORBIS_ENCODER ?
+                         AV_CODEC_ID_VORBIS : AV_CODEC_ID_FLAC,
     .video_codec       = AV_CODEC_ID_THEORA,
     .write_header      = ogg_write_header,
     .write_packet      = ogg_write_packet,
     .video_codec       = AV_CODEC_ID_THEORA,
     .write_header      = ogg_write_header,
     .write_packet      = ogg_write_packet,