summaryrefslogtreecommitdiff
path: root/libavformat/avienc.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-07-21 16:44:26 -0700
committerRonald S. Bultje <rsbultje@gmail.com>2012-07-22 16:10:21 -0700
commitfd4872184945ff4275f04f7b95ee7aba49407f3c (patch)
treeb94c5a725b61b55a5951a1d0c7b59b45b088fe9f /libavformat/avienc.c
parenta6e922ffa2fdcc467d07fd6454a4557625c750ad (diff)
downloadffmpeg-fd4872184945ff4275f04f7b95ee7aba49407f3c.tar.gz
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.
Diffstat (limited to 'libavformat/avienc.c')
-rw-r--r--libavformat/avienc.c6
1 files changed, 1 insertions, 5 deletions
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,