summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavformat/avienc.c6
-rwxr-xr-xtests/lavf-regression.sh2
2 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 1dbed8bc80..cf2e1d601d 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -644,7 +644,11 @@ AVOutputFormat ff_avi_muxer = {
.mime_type = "video/x-msvideo",
.extensions = "avi",
.priv_data_size = sizeof(AVIContext),
- .audio_codec = CODEC_ID_MP2,
+#if CONFIG_LIBMP3LAME_ENCODER
+ .audio_codec = CODEC_ID_MP3,
+#else
+ .audio_codec = CODEC_ID_AC3,
+#endif
.video_codec = CODEC_ID_MPEG4,
.write_header = avi_write_header,
.write_packet = avi_write_packet,
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index a3a0b86b96..8ed92771d0 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -44,7 +44,7 @@ do_audio_only()
}
if [ -n "$do_avi" ] ; then
-do_lavf avi
+do_lavf avi "-acodec mp2"
fi
if [ -n "$do_asf" ] ; then