[FFmpeg-cvslog] avienc: saner default audio codec.

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Aug 20 16:05:17 2011 +0200| [b71389cbaee037f90ddaf4f7e8892a17831e860e] | committer: Anton Khirnov

avienc: saner default audio codec.

libmp3lame if available, ac3 otherwise.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b71389cbaee037f90ddaf4f7e8892a17831e860e
---

 libavformat/avienc.c     |    6 +++++-
 tests/lavf-regression.sh |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 1dbed8b..cf2e1d6 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 a3a0b86..8ed9277 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