]> git.sesse.net Git - ffmpeg/commitdiff
Never use MP3 as default audio codec for asf.
authorami_stuff <ami_stuff@o2.pl>
Fri, 11 Nov 2011 22:47:34 +0000 (23:47 +0100)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Fri, 11 Nov 2011 22:49:30 +0000 (23:49 +0100)
Some Windows versions do not ship an appropriate MP3 decoder.

libavformat/asfenc.c

index 092fa40aa2736365fba4f30410a2c63190f0cf41..0b084c0322df07eb5c00814a255ab6e41449a2d9 100644 (file)
@@ -883,11 +883,7 @@ AVOutputFormat ff_asf_muxer = {
     .mime_type      = "video/x-ms-asf",
     .extensions     = "asf,wmv,wma",
     .priv_data_size = sizeof(ASFContext),
-#if CONFIG_LIBMP3LAME
-    .audio_codec    = CODEC_ID_MP3,
-#else
     .audio_codec    = CODEC_ID_WMAV2,
-#endif
     .video_codec    = CODEC_ID_MSMPEG4V3,
     .write_header   = asf_write_header,
     .write_packet   = asf_write_packet,
@@ -904,11 +900,7 @@ AVOutputFormat ff_asf_stream_muxer = {
     .mime_type      = "video/x-ms-asf",
     .extensions     = "asf,wmv,wma",
     .priv_data_size = sizeof(ASFContext),
-#if CONFIG_LIBMP3LAME
-    .audio_codec    = CODEC_ID_MP3,
-#else
     .audio_codec    = CODEC_ID_WMAV2,
-#endif
     .video_codec    = CODEC_ID_MSMPEG4V3,
     .write_header   = asf_write_stream_header,
     .write_packet   = asf_write_packet,