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/nutenc.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'libavformat/nutenc.c')

diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 21af7ca9cf..76d5852ce0 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -866,13 +866,8 @@ AVOutputFormat ff_nut_muxer = {
     .mime_type      = "video/x-nut",
     .extensions     = "nut",
     .priv_data_size = sizeof(NUTContext),
-#if   CONFIG_LIBVORBIS
-    .audio_codec    = CODEC_ID_VORBIS,
-#elif CONFIG_LIBMP3LAME
-    .audio_codec    = CODEC_ID_MP3,
-#else
-    .audio_codec    = CODEC_ID_MP2,
-#endif
+    .audio_codec    = CONFIG_LIBVORBIS ? CODEC_ID_VORBIS :
+                      CONFIG_LIBMP3LAME ? CODEC_ID_MP3 : CODEC_ID_MP2,
     .video_codec    = CODEC_ID_MPEG4,
     .write_header   = nut_write_header,
     .write_packet   = nut_write_packet,
-- 
cgit v1.2.3