diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-09 23:03:56 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-09 23:04:01 +0400 |
| commit | cf0e5b7fd4d18ac69f14adca529558edbb9baac3 (patch) | |
| tree | a09a97210e8b8fe34ac4b98e167642dac3f00cf1 /libavformat/oggenc.c | |
| parent | 5b23c7ed6fa9ac99894621fefd2d18b27704913e (diff) | |
| parent | b0c2c097e422b9e10a7d856582f8321d28af821e (diff) | |
Merge commit 'b0c2c097e422b9e10a7d856582f8321d28af821e'
* commit 'b0c2c097e422b9e10a7d856582f8321d28af821e':
lavf: default .ogg audio to libvorbis if we can
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggenc.c')
| -rw-r--r-- | libavformat/oggenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index d9ef23c445..9c64755595 100644 --- 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, |