From fd4872184945ff4275f04f7b95ee7aba49407f3c Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Sat, 21 Jul 2012 16:44:26 -0700
Subject: lavf: use conditional notation for default codec in muxer
 declarations.

This removes the use of macro nesting in these code constructs, which
makes it easier to parse in pre-processors.
---
 libavformat/avienc.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'libavformat/avienc.c')

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 3689f57f11..e611dcaae2 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -645,11 +645,7 @@ AVOutputFormat ff_avi_muxer = {
     .mime_type         = "video/x-msvideo",
     .extensions        = "avi",
     .priv_data_size    = sizeof(AVIContext),
-#if CONFIG_LIBMP3LAME_ENCODER
-    .audio_codec       = CODEC_ID_MP3,
-#else
-    .audio_codec       = CODEC_ID_AC3,
-#endif
+    .audio_codec       = CONFIG_LIBMP3LAME ? CODEC_ID_MP3 : CODEC_ID_AC3,
     .video_codec       = CODEC_ID_MPEG4,
     .write_header      = avi_write_header,
     .write_packet      = avi_write_packet,
-- 
cgit v1.2.1