Merge commit 'b0c2c097e422b9e10a7d856582f8321d28af821e'

* commit 'b0c2c097e422b9e10a7d856582f8321d28af821e': lavf: default .ogg audio to libvorbis if we can Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · cf0e5b7fd4
parent 5b23c7ed6f b0c2c097e4
commit cf0e5b7fd4
1 changed files with 2 additions and 1 deletions
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@ -637,7 +637,8 @@ AVOutputFormat ff_ogg_muxer = {
 #endif
                         ,
    .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,